From 42a7a05dbb23ccfba21b01938f64cbb2b0ffed04 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 5 Jul 2014 11:47:14 +0200 Subject: [PATCH] tools-xentrace-prefix.diff Patch-Name: tools-xentrace-prefix.diff Gbp-Pq: Topic prefix-abiname Gbp-Pq: Name tools-xentrace-prefix.diff --- tools/xentrace/Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 0bad942bdf..f803612c45 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -8,6 +8,7 @@ CFLAGS += $(CFLAGS_libxenctrl) LDLIBS += $(LDLIBS_libxenevtchn) LDLIBS += $(LDLIBS_libxenctrl) LDLIBS += $(ARGP_LDFLAGS) +LDFLAGS += $(call LDFLAGS_RPATH,../lib) BIN-$(CONFIG_X86) = xenalyze BIN = $(BIN-y) @@ -23,21 +24,19 @@ build: $(BIN) $(SBIN) $(LIBBIN) .PHONY: install install: build - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(sbindir) - [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) ifneq ($(BIN),) - $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) + $(INSTALL_PROG) $(BIN) $(DESTDIR)$(LIBEXEC_BIN) endif - $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir) - $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) + $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(LIBEXEC_BIN) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) .PHONY: uninstall uninstall: rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(LIBBIN)) - rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS)) - rm -f $(addprefix $(DESTDIR)$(sbindir)/, $(SBIN)) + rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(SCRIPTS)) + rm -f $(addprefix $(DESTDIR)$(LIBEXEC_BIN)/, $(SBIN)) ifneq ($(BIN),) rm -f $(addprefix $(DESTDIR)$(bindir)/, $(BIN)) endif -- 2.30.2